Bump CAPI to v1.10.2 #1459

tamalsaha · 2025-03-26T13:10:02Z

What type of PR is this?

What this PR does / why we need it:
I fixed the validator and defaulter interface broken by controller-runtime.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

Special notes for your reviewer:

Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.

TODOs:

squashed commits
includes documentation
adds unit tests

Release note:

NONE

netlify · 2025-03-26T13:10:22Z

✅ Deploy Preview for kubernetes-sigs-cluster-api-gcp ready!

Name	Link
🔨 Latest commit	`df341e6`
🔍 Latest deploy log	https://app.netlify.com/projects/kubernetes-sigs-cluster-api-gcp/deploys/68378066836a250008d50afb
😎 Deploy Preview	https://deploy-preview-1459--kubernetes-sigs-cluster-api-gcp.netlify.app
📱 Preview on mobile	Toggle QR Code... Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

k8s-ci-robot · 2025-03-26T13:10:28Z

Welcome @tamalsaha!

It looks like this is your first PR to kubernetes-sigs/cluster-api-provider-gcp 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api-provider-gcp has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

k8s-ci-robot · 2025-03-26T13:10:29Z

Hi @tamalsaha. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

richardcase · 2025-03-26T14:13:42Z

@tamalsaha - please can you remove the vendor folder from this PR.

tamalsaha · 2025-03-27T01:05:53Z

Removed vendor folder @richardcase . PTAL.

richardcase · 2025-04-04T14:14:02Z

api/v1beta1/gcpcluster_webhook.go

@@ -33,36 +35,44 @@ var clusterlog = logf.Log.WithName("gcpcluster-resource")

 // SetupWebhookWithManager sets up and registers the webhook with the manager.
 func (c *GCPCluster) SetupWebhookWithManager(mgr ctrl.Manager) error {
+	w := new(gcpClusterWebhook)


Could we move the webhooks to internal/webhooks so that we start brining the structure in line with upstream CAPI and also kubebuilder

This sounds reasonable. But can this be done in a separate pr (preferrably by project maintainers), as this will look like a lot of change in the pr and mask the actual change needed to make things work with the kubebuilder api breakage?

Yeah +1 for doing this, but probably best to do it in a follow up PR to avoid polluting this one

go.mod

damdo · 2025-04-10T09:34:20Z

Hey @tamalsaha
Thanks a lot for the PR!

Now that a complete Go dependecy bump PR has merged from @cpanato #1449 would you be able to rebase yours on top of the latest main.

This should cover part of @richardcase comment here: #1459 (comment)

Also it looks like the CAPI v1.10.0-rc.0 is out, so it would be nice to use that instead of beta.0.
Thanks a lot!

damdo · 2025-04-15T09:44:34Z

/ok-to-test

salasberryfin · 2025-05-16T09:23:43Z

I guess we'll have to wait for the next CAPI patch release to have this fixed: kubernetes-sigs/cluster-api#12180. Is that correct?

damdo · 2025-05-16T09:55:48Z

Yes correct @salasberryfin

tamalsaha · 2025-05-20T20:28:59Z

New error:

failed to read "cluster-template-topology.yaml" from provider's repository "infrastructure-gcp": failed to read file "/logs/artifacts/repository/infrastructure-gcp/v1.10.99/cluster-template-topology.yaml" from local release v1.10.99: stat /logs/artifacts/repository/infrastructure-gcp/v1.10.99/cluster-template-topology.yaml: no such file or directory

https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-gcp/1459/pull-cluster-api-provider-gcp-capi-e2e/1918628474663211008

damdo · 2025-05-21T07:29:54Z

New error:

failed to read "cluster-template-topology.yaml" from provider's repository "infrastructure-gcp": failed to read file "/logs/artifacts/repository/infrastructure-gcp/v1.10.99/cluster-template-topology.yaml" from local release v1.10.99: stat /logs/artifacts/repository/infrastructure-gcp/v1.10.99/cluster-template-topology.yaml: no such file or directory

https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-gcp/1459/pull-cluster-api-provider-gcp-capi-e2e/1918628474663211008

It looks like you fixed that thanks

damdo · 2025-05-21T07:32:29Z

@tamalsaha a couple of things to fix:

Something is off with go mod tidy here, could you please check: https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-gcp/1459/pull-cluster-api-provider-gcp-verify/1924940506333188096#1:build-log.txt%3A221-223
You need to change the references from CAPI v1.10.0 to v1.10.2 in the test/e2e/config/gcp-ci.yaml file

tamalsaha · 2025-05-21T19:28:16Z

"admission webhook "validation.cluster.cluster.x-k8s.io" denied the request: Cluster.cluster.x-k8s.io "capg-e2e-yoj5vd" is invalid: [spec.infrastructureRef: Forbidden: cannot be removed, spec.controlPlaneRef: Forbidden: cannot be removed]"

https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-gcp/1459/pull-cluster-api-provider-gcp-e2e-test/1925262520579264512

damdo · 2025-05-22T10:29:46Z

"admission webhook "validation.cluster.cluster.x-k8s.io" denied the request: Cluster.cluster.x-k8s.io "capg-e2e-yoj5vd" is invalid: [spec.infrastructureRef: Forbidden: cannot be removed, spec.controlPlaneRef: Forbidden: cannot be removed]"

https://prow.k8s.io/view/gs/kubernetes-ci-logs/pr-logs/pull/kubernetes-sigs_cluster-api-provider-gcp/1459/pull-cluster-api-provider-gcp-e2e-test/1925262520579264512

@tamalsaha yes, this is what I was asking @salasberryfin about, as he last touched that area of tests.
I'll try to chat with him on the thread to see if we can get this sorted.

damdo · 2025-05-27T07:45:34Z

@tamalsaha, @salasberryfin replied here, https://kubernetes.slack.com/archives/C01D1RFEN9G/p1748331885434999?thread_ts=1745836188.671049&cid=C01D1RFEN9G would you be able to try that out? Thanks!

damdo · 2025-05-28T20:01:39Z

cc. @tamalsaha

Signed-off-by: Tamal Saha <[email protected]>

Signed-off-by: Carlos Salas <[email protected]>

tamalsaha · 2025-05-28T21:30:41Z

@damdo Done.

k8s-ci-robot · 2025-05-28T21:36:02Z

@tamalsaha: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
pull-cluster-api-provider-gcp-apidiff	`df341e6`	link	false	`/test pull-cluster-api-provider-gcp-apidiff`

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

damdo · 2025-05-29T07:48:25Z

/test pull-cluster-api-provider-gcp-conformance
/test pull-cluster-api-provider-gcp-capi-e2e

damdo

e2e, capi-e2e and conformance all passed

/approve

k8s-ci-robot · 2025-05-29T08:56:08Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: damdo, tamalsaha

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [damdo]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

damdo · 2025-05-29T08:56:41Z

Added my approval

@richardcase @salasberryfin @cpanato

are you able to LGTM if you are happy with it? Thanks!

salasberryfin · 2025-05-29T08:57:34Z

Thanks a lot @tamalsaha @damdo.

/lgtm

damdo · 2025-05-29T08:59:05Z

Awesome, thanks a ton @tamalsaha !!

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 26, 2025

k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Mar 26, 2025

k8s-ci-robot requested review from richardcase and salasberryfin March 26, 2025 13:10

k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Mar 26, 2025

tamalsaha force-pushed the k132 branch from 14cb33a to 13c273e Compare March 27, 2025 01:03

k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Mar 27, 2025

k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 27, 2025

richardcase reviewed Apr 4, 2025

View reviewed changes

k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 10, 2025

tamalsaha force-pushed the k132 branch from 13c273e to 3975a02 Compare April 14, 2025 23:28

k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Apr 14, 2025

tamalsaha force-pushed the k132 branch 2 times, most recently from b824d79 to 4bee5aa Compare April 14, 2025 23:38

tamalsaha changed the title ~~Use k8s 1.32 client libs~~ Bump CAPI to v1.10.0-rc.0 Apr 14, 2025

tamalsaha force-pushed the k132 branch from 4bee5aa to 5fa8855 Compare April 14, 2025 23:42

tamalsaha force-pushed the k132 branch from efef5d1 to 18888f2 Compare May 8, 2025 02:09

tamalsaha changed the title ~~Bump CAPI to v1.10.1~~ Bump CAPI to v1.10.2 May 20, 2025

tamalsaha force-pushed the k132 branch from cae5344 to 3691997 Compare May 20, 2025 21:29

tamalsaha force-pushed the k132 branch from 3691997 to 41fdae0 Compare May 21, 2025 18:35

Bump CAPI to v1.10.2

cef2ebd

Signed-off-by: Tamal Saha <[email protected]>

tamalsaha force-pushed the k132 branch from 65a9eb1 to cef2ebd Compare May 28, 2025 21:26

test: use unique cluster name to avoid collisions

df341e6

Signed-off-by: Carlos Salas <[email protected]>

damdo reviewed May 29, 2025

View reviewed changes

k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 29, 2025

k8s-ci-robot assigned salasberryfin May 29, 2025

k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 29, 2025

k8s-ci-robot merged commit 7aa05f2 into kubernetes-sigs:main May 29, 2025
18 of 19 checks passed

k8s-ci-robot added this to the v1.1.0 milestone May 29, 2025

tamalsaha deleted the k132 branch May 29, 2025 09:37

Bump CAPI to v1.10.2 #1459

Bump CAPI to v1.10.2 #1459

Uh oh!

Conversation

tamalsaha commented Mar 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

netlify bot commented Mar 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

✅ Deploy Preview for kubernetes-sigs-cluster-api-gcp ready!

Uh oh!

k8s-ci-robot commented Mar 26, 2025

Uh oh!

k8s-ci-robot commented Mar 26, 2025

Uh oh!

richardcase commented Mar 26, 2025

Uh oh!

tamalsaha commented Mar 27, 2025

Uh oh!

richardcase Apr 4, 2025

Choose a reason for hiding this comment

Uh oh!

tamalsaha Apr 14, 2025

Choose a reason for hiding this comment

Uh oh!

damdo Apr 28, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

damdo commented Apr 10, 2025

Uh oh!

damdo commented Apr 15, 2025

Uh oh!

salasberryfin commented May 16, 2025

Uh oh!

damdo commented May 16, 2025

Uh oh!

tamalsaha commented May 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

damdo commented May 21, 2025

Uh oh!

damdo commented May 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

tamalsaha commented May 21, 2025

Uh oh!

damdo commented May 22, 2025

Uh oh!

damdo commented May 27, 2025

Uh oh!

damdo commented May 28, 2025

Uh oh!

tamalsaha commented May 28, 2025

Uh oh!

k8s-ci-robot commented May 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

damdo commented May 29, 2025

Uh oh!

damdo left a comment

Choose a reason for hiding this comment

Uh oh!

k8s-ci-robot commented May 29, 2025

Uh oh!

damdo commented May 29, 2025

Uh oh!

salasberryfin commented May 29, 2025

Uh oh!

damdo commented May 29, 2025

Uh oh!

Uh oh!

Uh oh!

tamalsaha commented Mar 26, 2025 •

edited

Loading

netlify bot commented Mar 26, 2025 •

edited

Loading

tamalsaha commented May 20, 2025 •

edited

Loading

damdo commented May 21, 2025 •

edited

Loading

k8s-ci-robot commented May 28, 2025 •

edited

Loading